merge with xen-unstable.hg

diff --cc linux-2.6-xen-sparse/arch/ia64/xen/Makefile
index ce1f07cac373258bf1dec313809de3e5dc8ac6bd,5794a4136c91f9d0701258db5de081547c3d2570..da3ca07cd00807eb0d090e2b64a27febb0772a55
--- 1/linux-2.6-xen-sparse/arch/ia64/xen/Makefile
--- 2/linux-2.6-xen-sparse/arch/ia64/xen/Makefile
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/Makefile
@@@ -2,7 -2,7 +2,7 @@@
  # Makefile for Xen components
  #
  
- obj-y := hypercall.o xenivt.o xenentry.o xensetup.o xenpal.o xenhpski.o xenconsole.o xen_ksyms.o
+ obj-y := hypercall.o xenivt.o xenentry.o xensetup.o xenpal.o xenhpski.o xenconsole.o
  
 -obj-$(CONFIG_XEN_IA64_DOM0_VP) += hypervisor.o pci-dma-xen.o
 +obj-$(CONFIG_XEN_IA64_DOM0_VP) += hypervisor.o pci-dma-xen.o util.o
- pci-dma-xen-$(CONFIG_XEN_IA64_DOM0_VP) := ../../i386/kernel/pci-dma-xen.o
+ pci-dma-xen-$(CONFIG_XEN_IA64_DOM0_VP) := ../../i386/kernel/pci-dma-xen.o

diff --cc linux-2.6-xen-sparse/arch/ia64/xen/drivers/xenia64_init.c
Simple merge

diff --cc linux-2.6-xen-sparse/arch/ia64/xen/xensetup.S
Simple merge

diff --cc linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
index 86fc59d809977c69e0c01b11477a7bc46318c069,281b1af3cb1a2ce0175093cb2baf88d9743f1ab3..d70cf36ce953a08eadcbeb43605c17ae76c93b99
--- 1/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
--- 2/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
+++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
@@@ -169,24 -158,11 +169,24 @@@ void __xen_destroy_contiguous_region(un
  static inline void
  xen_destroy_contiguous_region(unsigned long vstart, unsigned int order)
  {
-       if (running_on_xen)
+       if (is_running_on_xen())
                __xen_destroy_contiguous_region(vstart, order);
  }
 +
 +// for netfront.c, netback.c
 +#define MULTI_UVMFLAGS_INDEX 0 //XXX any value
 +
 +static inline void
 +MULTI_update_va_mapping(
 +      multicall_entry_t *mcl, unsigned long va,
 +      pte_t new_val, unsigned long flags)
 +{
 +      mcl->op = __HYPERVISOR_update_va_mapping;
 +      mcl->result = 0;
 +}
 +
  #else
 -#define xen_create_contiguous_region(vstart, order, address_bits)     ({0;})
 +#define xen_create_contiguous_region(vstart, order, address_bits)     (0)
  #define xen_destroy_contiguous_region(vstart, order)  do {} while (0)
  #endif
  

diff --cc linux-2.6-xen-sparse/include/asm-ia64/xen/privop.h
index 6c791978878018c5b66e5d83a620e27f8660c5ba,29ff8820dd744ff116af2daf14502803ed97a05e..660fef75fbf5494cc627db75e842fd5e832de83a
--- 1/linux-2.6-xen-sparse/include/asm-ia64/xen/privop.h
--- 2/linux-2.6-xen-sparse/include/asm-ia64/xen/privop.h
+++ b/linux-2.6-xen-sparse/include/asm-ia64/xen/privop.h
@@@ -42,15 -41,10 +42,10 @@@
  #endif
  
  #ifndef __ASSEMBLY__
- #ifdef MODULE
- extern int is_running_on_xen(void);
- #define running_on_xen (is_running_on_xen())
- #else
  extern int running_on_xen;
- #endif
  
 -#define       XEN_HYPER_SSM_I                 asm("break 0x7");
 -#define       XEN_HYPER_GET_IVR               asm("break 0x8");
 +#define       XEN_HYPER_SSM_I         asm("break %0" : : "i" (HYPERPRIVOP_SSM_I))
 +#define       XEN_HYPER_GET_IVR       asm("break %0" : : "i" (HYPERPRIVOP_GET_IVR))
  
  /************************************************/
  /* Instructions paravirtualized for correctness */

diff --cc tools/libxc/xc_linux_build.c
Simple merge

diff --cc xen/include/asm-ia64/event.h
Simple merge

diff --cc xen/include/public/arch-ia64.h
index 19716fe79b9b85e64fec6b00750ce4ba0fc50e48,d404d47d16a4967d4eaf7ee60e152a9fd0f3c22f..a4d5ead84de88d70463b40961a5657f61c696d51
--- 1/xen/include/public/arch-ia64.h
--- 2/xen/include/public/arch-ia64.h
+++ b/xen/include/public/arch-ia64.h
@@@ -290,28 -296,31 +296,32 @@@ struct mapped_regs 
      unsigned long  reserved6[3456];
      unsigned long  vmm_avail[128];
      unsigned long  reserved7[4096];
- } mapped_regs_t;
+ };
+ typedef struct mapped_regs mapped_regs_t;
  
- typedef struct {
- } arch_vcpu_info_t;
+ struct arch_vcpu_info {
 -    struct mapped_regs *privregs;
 -    int evtchn_vector;
+ };
+ typedef struct arch_vcpu_info arch_vcpu_info_t;
  
  typedef mapped_regs_t vpd_t;
  
- typedef struct {
+ struct arch_shared_info {
      unsigned int flags;
      unsigned long start_info_pfn;
- } arch_shared_info_t;
 +
 +    /* Interrupt vector for event channel.  */
 +    int evtchn_vector;
+ };
+ typedef struct arch_shared_info arch_shared_info_t;
  
- typedef struct {
+ struct arch_initrd_info {
      unsigned long start;
      unsigned long size;
- } arch_initrd_info_t;
+ };
+ typedef struct arch_initrd_info arch_initrd_info_t;
  
  #define IA64_COMMAND_LINE_SIZE 512
- typedef struct vcpu_guest_context {
+ struct vcpu_guest_context {
  #define VGCF_FPU_VALID (1<<0)
  #define VGCF_VMX_GUEST (1<<1)
  #define VGCF_IN_KERNEL (1<<2)
@@@ -321,12 -330,13 +331,13 @@@
      unsigned long sys_pgnr;    /* System pages out of domain memory */
      unsigned long vm_assist;   /* VMASST_TYPE_* bitmap, now none on IPF */
  
-     cpu_user_regs_t regs;
-     mapped_regs_t *privregs;
-     arch_shared_info_t shared;
-     arch_initrd_info_t initrd;
+     struct cpu_user_regs regs;
 -    struct arch_vcpu_info vcpu;
++    struct mapped_regs *privregs;
+     struct arch_shared_info shared;
+     struct arch_initrd_info initrd;
      char cmdline[IA64_COMMAND_LINE_SIZE];
- } vcpu_guest_context_t;
+ };
+ typedef struct vcpu_guest_context vcpu_guest_context_t;
  DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t);
  
  // dom0 vp op